merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 27 Sep 2010 05:42:43 +0000 (14:42 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 27 Sep 2010 05:42:43 +0000 (14:42 +0900)
commit7d2943ef77a2d72aab7d2cfe14e3033dd7161818
tree8c87d8f8195123a2c8616f98dde96a7db6884dfc
parent9c9602517a8e4fa14a97f5eb40ec044e0ba86346
parentab74335ee0cc8765407c1290630e328c2f68c062
merge trunk
src/ChangeLog
src/dispextern.h
src/dispnew.c
src/term.c
src/xdisp.c